From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 01:46:27 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=44074387d5a68511f0da1fbcf6a695d1f8c7f112;p=emacs.git

merge from trunk
---

44074387d5a68511f0da1fbcf6a695d1f8c7f112